Fix reftests

Multiple reftests were damaged by the element name transition.
Repair them. The region reftests are no longer needed, since
we no longer do regions.

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index bcadea74a9cc0595dc3927542497ce4f67d4c4f2..584d47e41e2ce3149c1c94f6cbb9eccc63aa0860 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -213,12 +213,6 @@ testdata = \
        css-match-name.css \
        css-match-name.ref.ui \
        css-match-name.ui \
-       css-match-region-matches-star.css \
-       css-match-region-matches-star.ui \
-       css-match-region-matches-star.ref.ui \
-       css-match-regions.css \
-       css-match-regions.ref.ui \
-       css-match-regions.ui \
        css-match-siblings.css \
        css-match-siblings.ref.ui \
        css-match-siblings.ui \

diff --git a/testsuite/reftests/css-match-import-import.css b/testsuite/reftests/css-match-import-import.css
index a6239ee3abaf76932b8ce936f2be1d69f1abd5bb..e6e6c9a266c28a6a32adf6ae19cb8c3670743e6a 100644 (file)
--- a/testsuite/reftests/css-match-import-import.css
+++ b/testsuite/reftests/css-match-import-import.css
@@ -1,4 +1,4 @@
-GtkLabel {
+label {
   color: blue;
 }
 

diff --git a/testsuite/reftests/css-match-import.css b/testsuite/reftests/css-match-import.css
index a02915b69bceb5aacf1ffc84ea0cdacf0df2e802..6dbdf4b8a874320e1be8a121ef032bb85ac1429f 100644 (file)
--- a/testsuite/reftests/css-match-import.css
+++ b/testsuite/reftests/css-match-import.css
@@ -1,6 +1,6 @@
 @import url("css-match-import-import.css");
 
-GtkLabel {
+label {
   color: purple;
 }
 

diff --git a/testsuite/reftests/css-match-inherit-different-state.css b/testsuite/reftests/css-match-inherit-different-state.css
index d164300dcc7d436fcc08a07af702351c1b2ac5d7..8cf1f0c0b0301939fc0f0eb14d0ec1a1041fcae8 100644 (file)
--- a/testsuite/reftests/css-match-inherit-different-state.css
+++ b/testsuite/reftests/css-match-inherit-different-state.css
@@ -7,6 +7,6 @@
   color: red;
 }
 
-GtkLabel:insensitive {
+label:insensitive {
   color: inherit;
 }

diff --git a/testsuite/reftests/css-match-region-matches-star.css b/testsuite/reftests/css-match-region-matches-star.css
deleted file mode 100644 (file)
index 96203ac..0000000
--- a/testsuite/reftests/css-match-region-matches-star.css
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "reset-to-defaults.css";
-
-GtkNotebook * GtkLabel {
-  color: blue
-}
-
-/* for reference */
-#blue {
-  color: blue
-}

diff --git a/testsuite/reftests/css-match-region-matches-star.ref.ui b/testsuite/reftests/css-match-region-matches-star.ref.ui
deleted file mode 100644 (file)
index 3ee31fb..0000000
--- a/testsuite/reftests/css-match-region-matches-star.ref.ui
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="type">popup</property>
-    <child>
-      <object class="GtkNotebook" id="notebook1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page 1</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page 1</property>
-            <property name="name">blue</property>
-          </object>
-          <packing>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/reftests/css-match-region-matches-star.ui b/testsuite/reftests/css-match-region-matches-star.ui
deleted file mode 100644 (file)
index adddba4..0000000
--- a/testsuite/reftests/css-match-region-matches-star.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="type">popup</property>
-    <child>
-      <object class="GtkNotebook" id="notebook1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page 1</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Page 1</property>
-          </object>
-          <packing>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/reftests/css-match-regions.css b/testsuite/reftests/css-match-regions.css
deleted file mode 100644 (file)
index ecd127d..0000000
--- a/testsuite/reftests/css-match-regions.css
+++ /dev/null
@@ -1,18 +0,0 @@
-@import "reset-to-defaults.css";
-
-* {
-  -GtkNotebook-tab-overlap: 0; /* work around a notebook tab rendering bug */
-  color: blue;
-}
-
-.notebook tab GtkLabel {
-  color: blue
-}
-.notebook tab tab GtkLabel {
-  color: red
-}
-
-/* for reference */
-#red {
-  color: red
-}

diff --git a/testsuite/reftests/css-match-regions.ref.ui b/testsuite/reftests/css-match-regions.ref.ui
deleted file mode 100644 (file)
index c1e21a6..0000000
--- a/testsuite/reftests/css-match-regions.ref.ui
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="type">popup</property>
-    <child>
-      <object class="GtkNotebook" id="notebook1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Normal</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Red</property>
-            <property name="name">red</property>
-          </object>
-          <packing>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Normal</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkNotebook" id="notebook2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Red</property>
-                <property name="name">red</property>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Red</property>
-                <property name="name">red</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/reftests/css-match-regions.ui b/testsuite/reftests/css-match-regions.ui
deleted file mode 100644 (file)
index 15452bf..0000000
--- a/testsuite/reftests/css-match-regions.ui
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="type">popup</property>
-    <child>
-      <object class="GtkNotebook" id="notebook1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Normal</property>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Red</property>
-          </object>
-          <packing>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Normal</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkNotebook" id="notebook2">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Red</property>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Red</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/reftests/css-match-siblings.css b/testsuite/reftests/css-match-siblings.css
index baf2e7dab369579b653c4d34f6561bfd335f3060..4c99c614bc4b3120afc6dffb454f025e07b1ff2f 100644 (file)
--- a/testsuite/reftests/css-match-siblings.css
+++ b/testsuite/reftests/css-match-siblings.css
@@ -3,17 +3,17 @@
   color: red
 }
 
-* ~ * ~ GtkLabel,
+* ~ * ~ label,
 #lime {
   color: lime;
 }
 
-* ~ * + GtkLabel ~ *,
+* ~ * + label ~ *,
 #blue {
   color: blue;
 }
 
-* + GtkLabel ~ * ~ GtkLabel + *,
+* + label ~ * ~ label + *,
 #purple {
   color: purple;
 }

diff --git a/testsuite/reftests/entry-progress-coloring.css b/testsuite/reftests/entry-progress-coloring.css
index 607254d90856ced1e15983841b1154316fca74b0..81b312e2cb17eb627458a8ed91b00c28b767b2ff 100644 (file)
--- a/testsuite/reftests/entry-progress-coloring.css
+++ b/testsuite/reftests/entry-progress-coloring.css
@@ -4,11 +4,11 @@
   font: Monospace;
 }
 
-GtkEntry #padded {
+entry #padded {
   padding: 10px;
 }
 
-.progressbar {
+progress {
   background-color: rgba(0,0,0,0);
   background-image: none;
   border-color: rgba(0,0,0,0);

diff --git a/testsuite/reftests/icon-vfuncs.css b/testsuite/reftests/icon-vfuncs.css
index aab3db4afb791f7ecea9f2fa063cb7a7b84e8701..00ce4ed01ba0a044ad0606cc11ee0caf6dd3fbf3 100644 (file)
--- a/testsuite/reftests/icon-vfuncs.css
+++ b/testsuite/reftests/icon-vfuncs.css
@@ -11,6 +11,6 @@
   font-size: 20px;
 }
 
-GtkImage {
+image {
   background: lime;
 }

diff --git a/testsuite/reftests/iconview-empty.css b/testsuite/reftests/iconview-empty.css
index 519b8ebd1b7c97e04b790636fe3b47f5dd5fc707..98b2d5e8ad1a5836e7b849c3a36f3f18e176d119 100644 (file)
--- a/testsuite/reftests/iconview-empty.css
+++ b/testsuite/reftests/iconview-empty.css
@@ -1,5 +1,5 @@
 @import "reset-to-defaults.css";
 
-GtkIconView, GtkImage {
+GtkIconView, image {
   background-color: blue;
 }

diff --git a/testsuite/reftests/label-background.css b/testsuite/reftests/label-background.css
index 82bb5fbbd0129be24031e9276ca540777fc23a18..37d4d08f536cd0a793ea886fc3d775e65804e92b 100644 (file)
--- a/testsuite/reftests/label-background.css
+++ b/testsuite/reftests/label-background.css
@@ -6,6 +6,6 @@ GtkBox {
   background: red; /* should also never be seen */
 }
 
-GtkLabel {
+label {
   background: green;
 }

diff --git a/testsuite/reftests/label-clipping.css b/testsuite/reftests/label-clipping.css
index b2e2497b5517703f227586bb02706bdf8e25bbd7..2c4fc9160fe19581ef38ac50d57f251f09b332a8 100644 (file)
--- a/testsuite/reftests/label-clipping.css
+++ b/testsuite/reftests/label-clipping.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkLabel {
+label {
   font-size: 40px;
   font-style: italic;
 }

diff --git a/testsuite/reftests/label-shadows.css b/testsuite/reftests/label-shadows.css
index 5df0f4c2498bcbd799277d668067f90e35d5b6eb..06f92adc2c8870c08e9f8e2261aaf9782aafd1f4 100644 (file)
--- a/testsuite/reftests/label-shadows.css
+++ b/testsuite/reftests/label-shadows.css
@@ -1,4 +1,4 @@
-GtkLabel {
+label {
   engine: none;
   text-shadow: 1px 1px red;
 }

diff --git a/testsuite/reftests/label-sizing.css b/testsuite/reftests/label-sizing.css
index 0d356b6819f1d23aa7ce631c0a7e54a729b8aee5..ca06c8fd5936cb935b1201ac1f8726458b2efa0b 100644 (file)
--- a/testsuite/reftests/label-sizing.css
+++ b/testsuite/reftests/label-sizing.css
@@ -3,6 +3,6 @@
   padding: 0;
 }
 
-GtkPaned GtkLabel {
+GtkPaned label {
   background-color: pink
 }

diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.css b/testsuite/reftests/label-text-shadow-changes-modify-clip.css
index bea2d0c6e83d68a7136524f9e5a81aef1f79de59..0a539076e8425dc1d66c14f77fe37d68b22c34d8 100644 (file)
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.css
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.css
@@ -5,7 +5,7 @@
   100% { text-shadow: 20px 20px tomato; }
 }
 
-GtkLabel {
+label {
   font-size: 40px;
   animation-name: foo;
   animation-duration: 100s;

diff --git a/testsuite/reftests/label-text-shadow-clipping.css b/testsuite/reftests/label-text-shadow-clipping.css
index 9b13b51fbd35cf43f721809e90dcdc17bbba1528..a518aa04eb3964e5762263c76b964991660cb405 100644 (file)
--- a/testsuite/reftests/label-text-shadow-clipping.css
+++ b/testsuite/reftests/label-text-shadow-clipping.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkLabel {
+label {
   font-size: 40px;
   text-shadow: 20px 20px tomato;
 }

diff --git a/testsuite/reftests/opacity-initial.css b/testsuite/reftests/opacity-initial.css
index 611a8cd421a01b54721a84b0c412a57117a32bfc..ff6903c182d655534921a976c0264118619194da 100644 (file)
--- a/testsuite/reftests/opacity-initial.css
+++ b/testsuite/reftests/opacity-initial.css
@@ -1,3 +1,3 @@
-GtkLabel {
+label {
   opacity: 0;
 }

diff --git a/testsuite/reftests/shorthand-entry-border.css b/testsuite/reftests/shorthand-entry-border.css
index 0d1d4631d8a3f945a0b7ab4d5d9f4f8aaa109159..93bad6ee8ad6567ff28fe1e966494f39a0b91e68 100644 (file)
--- a/testsuite/reftests/shorthand-entry-border.css
+++ b/testsuite/reftests/shorthand-entry-border.css
@@ -7,11 +7,11 @@ GtkWidget {
   border-right-width: 5px;
 }
 
-GtkEntry {
+entry {
   border-width: 10px 20px;
 }
 
-.entry {
+entry {
   border-left-width: 10px;
   border-right-width: 10px;
 }

diff --git a/testsuite/reftests/sizegroups-basics.css b/testsuite/reftests/sizegroups-basics.css
index 6ae37b9fc984ca5935f42e87cba80baad3422686..4eda6b90ea4c4b1f840c64a662bb4cf0e49c8aab 100644 (file)
--- a/testsuite/reftests/sizegroups-basics.css
+++ b/testsuite/reftests/sizegroups-basics.css
@@ -1,4 +1,4 @@
-GtkLabel {
+label {
   background-image: none;
   background-color: purple;
   color: white;

diff --git a/testsuite/reftests/style-context-save-inheritance.css b/testsuite/reftests/style-context-save-inheritance.css
index 3f3630c06ed01d787081339bda879dbb8fc40b95..5c7957af211a37caf33ae742dc7ead13558c63e0 100644 (file)
--- a/testsuite/reftests/style-context-save-inheritance.css
+++ b/testsuite/reftests/style-context-save-inheritance.css
@@ -4,12 +4,12 @@
   color: red;
 }
 
-GtkLabel {
+label {
   color: green;
 }
 
-GtkLabel:link,
-GtkLabel:visited {
+label:link,
+label:visited {
   color: inherit;
 }
 

diff --git a/testsuite/reftests/treeview-fixed-height.css b/testsuite/reftests/treeview-fixed-height.css
index e203cc6d5ad4c4011c2f2ceb503cd8185f5ce67c..09160c1d2c0818157968ffa335d13e3c39590613 100644 (file)
--- a/testsuite/reftests/treeview-fixed-height.css
+++ b/testsuite/reftests/treeview-fixed-height.css
@@ -20,7 +20,7 @@
     background-color: white;
 }
 
-GtkImage, GtkLabel, .menuitem {
+image, label, .menuitem {
     background-color: transparent;
 }